Merge branch 'release/nginx-1'
Merge tag 'nginx-1' into develop

nginx