correct location and refresh header re-writing for localhost proxy
Merge remote-tracking branch: upstream/master