Merge branch 'develop' into feature/rewrite

Conflicts:
	requests/__init__.py
	requests/models.py

diff --cc requests/__init__.py
Simple merge

diff --cc requests/models.py
index f86d804875f530d98dc36fc13fa62f3f9d5163f6,fd74ed5411779f146d07f9d3bc3d3d016500d854..35058911731ff1e871a757f66526254de05f56f1
--- 1/requests/models.py
--- 2/requests/models.py
+++ b/requests/models.py
@@@ -19,11 -20,14 +20,18 @@@ from .hooks import dispatch_hoo
  from .structures import CaseInsensitiveDict
  from .packages.poster.encode import multipart_encode
  from .packages.poster.streaminghttp import register_openers, get_handlers
- from .utils import (dict_from_cookiejar, get_unicode_from_response, stream_decode_response_unicode, decode_gzip, stream_decode_gzip)
  from .status_codes import codes
+ from .exceptions import Timeout, URLRequired, TooManyRedirects
+ from .monkeys import Request as _Request
+ from .monkeys import HTTPRedirectHandler
 +from .exceptions import Timeout, URLRequired, TooManyRedirects, RequestException, HTTPError
++from .exceptions import Timeout, URLRequired, TooManyRedirects
++from .monkeys import Request as _Request
++from .monkeys import HTTPRedirectHandler
+ from .utils import (
+     dict_from_cookiejar, get_unicode_from_response,
+     stream_decode_response_unicode, decode_gzip, stream_decode_gzip)
  
- from .auth import dispatch as auth_dispatch
  
  REDIRECT_STATI = (codes.moved, codes.found, codes.other, codes.temporary_moved)
  

diff --cc requests/sessions.py
Simple merge