NginX upstream release
Merge remote-tracking branch 'remotes/vladgh/master'