merged change between nginx 1.6.2 and 1.6.1
Merge pull request #532 from cfsego/merge-1.6.2

merged change between nginx 1.6.2 and 1.6.1