Merge officials branch 'default' from http://hg.nginx.org/nginx/