Merge nginx.conf patch from master.