Merge pull request #3941 from val-kulkov/nginx-package