Merge pull request #4706 from donvipre/nginx_1.12.1