Fix minor bug on localhost without proxy.
Merge remote-tracking branch 'origin/master'