Merge branch 'develop' into feature/rewrite

Conflicts:
	requests/__init__.py

diff --cc requests/defaults.py
index e3f5478,770001f..90faabe
--- 1/requests/defaults.py
--- 2/requests/defaults.py
+++ b/requests/defaults.py
@@@ -35,5 -36,4 +36,5 @@@ defaults['max_redirects'] = 3
  defaults['decode_unicode'] = True
  defaults['timeout_fallback'] = True
  # defaults['keep_alive'] = True
 -# defaults['max_connections'] = 10
 +defaults['pool_connections'] = 10
- defaults['pool_maxsize'] = 1
++defaults['pool_maxsize'] = 1

diff --cc requests/sessions.py
Simple merge

diff --cc test_requests.py
Simple merge