Merge pull request #718 from willmeek/http_proxy_bypass