Merge remote-tracking branch 'upstream/develop' into develop

requests/api.py

@@ -47,7 +47,7 @@ def request(method, url,
         auth = auth or auth_manager.get_auth(url),
         timeout = timeout or config.settings.timeout,
         allow_redirects = allow_redirects,
-        proxies = proxies
+        proxies = proxies or config.settings.proxies
     )
 
     r.send()

requests/config.py

@@ -55,4 +55,5 @@ class Settings(object):
 
 settings = Settings()
 settings.base_headers = {'User-Agent': 'python-requests.org'}
-settings.accept_gzip = True
+settings.accept_gzip = True
+settings.proxies = None