do not use http_proxy
Merge remote branch 'origin/4738_http_proxy'