Merge From http://hg.nginx.org/nginx/