merge change from nginx 1.7.3