Merge pull request #1937 from jaraco/master

Improved decoding support for Response.iter_content and iter_lines

diff --cc requests/models.py
Simple merge

diff --cc test_requests.py
index 55e7a3d11a637676edffc92584398334d0d08258,65eb571cf81d4ca678ad9a6ef5a32c8f1f006122..a1df1f19090bc812b94c735c53ee0ad774ecc38f
--- 1/test_requests.py
--- 2/test_requests.py
+++ b/test_requests.py
@@@ -8,8 -8,8 +8,9 @@@ import jso
  import os
  import pickle
  import unittest
 +import collections
  
+ import io
  import requests
  import pytest
  from requests.adapters import HTTPAdapter