do portmapping for 127.0.0.1 as well as localhost
Merge remote-tracking branch: upstream/master