Merge branch 'develop' into feature/rewrite

Conflicts:
	requests/__init__.py

requests/defaults.py

@@ -26,6 +26,7 @@ defaults = dict()
 defaults['base_headers'] = {
     'User-Agent': 'python-requests/%s' % __version__,
     'Accept-Encoding': ', '.join(('identity', 'deflate', 'compress', 'gzip')),
+    'Accept': '*/*'
 }
 
 defaults['proxies'] = {}
@@ -36,4 +37,4 @@ defaults['decode_unicode'] = True
 defaults['timeout_fallback'] = True
 # defaults['keep_alive'] = True
 defaults['pool_connections'] = 10
-defaults['pool_maxsize'] = 1
+defaults['pool_maxsize'] = 1

requests/sessions.py

@@ -168,8 +168,9 @@ class Session(object):
 
             args[attr] = merge_kwargs(local_val, session_val)
 
+
         # Arguments manipulation hook.
-        args = dispatch_hook('args', hooks, args)
+        args = dispatch_hook('args', args['hooks'], args)
 
         r = Request(**args)