Merge pull request #10894 from Ansuel/nginx