Merge "Fix the nginx config"