Using HTTP_PROXY=http://www-proxy.nl.blabla.com:8080
Merge remote-tracking branch 'JohanHolman/master'
Update error message wording