PHP-939: Slow connection in 1.4+
Merge pull request #553 from bjori/PHP-939-slow-w0

PHP-939: Slow connection in 1.4+

* bjori/PHP-939-slow-w0:
  PHP-939: Slow connection in 1.4+