Merge pull request #2640 from dirkfeytons/nginx_1.10.0