Merge pull request #631 from wilson208/key-server-timeout-fix