Merge pull request #606 from DavidS/use-key-server-pool