Merge pull request #7161 from Ansuel/nginxup