merged change between nginx 1.6.2 and 1.6.1