Merge "Change nginx configuration"