Merge pull request #2441 from pyhalov/nginx