Document the http_proxy environment variable
Merge branch 'master' into qt5