sync from hg
Merge branch 'master' of https://github.com/chencl/nginx-win64