Merge tag 'nginx-1' into develop

nginx
updated