merged with revision stable 0.13.8 of https://github.com/surfly/gevent‎