rewrite locations for localhost proxy
Merge remote-tracking branch: upstream/master