Merge branch 'master' of https://github.com/ContinuousFunction/requests into pr/2344

diff --cc requests/models.py
index 17ff46607721e26d7edf005d854e0c6a7ac6212e,8a71e28babb15620521d248a9672bebc46fee27c..22b6d1104672b994a939f072f3e3a13ddf6ff63e
--- 1/requests/models.py
--- 2/requests/models.py
+++ b/requests/models.py
@@@ -20,10 -20,11 +20,10 @@@ from .packages.urllib3.fields import Re
  from .packages.urllib3.filepost import encode_multipart_formdata
  from .packages.urllib3.util import parse_url
  from .packages.urllib3.exceptions import (
-     DecodeError, ReadTimeoutError, ProtocolError)
+     DecodeError, ReadTimeoutError, ProtocolError, LocationParseError)
  from .exceptions import (
 -    HTTPError, RequestException, MissingSchema, InvalidURL, 
 -    ChunkedEncodingError, ContentDecodingError, ConnectionError, 
 -    StreamConsumedError)
 +    HTTPError, MissingSchema, InvalidURL, ChunkedEncodingError,
 +    ContentDecodingError, ConnectionError, StreamConsumedError)
  from .utils import (
      guess_filename, get_auth_from_url, requote_uri,
      stream_decode_response_unicode, to_key_val_list, parse_header_links,