Merge branch 'master' into fix-pickling-adapters

Conflicts:
	AUTHORS.rst

diff --cc AUTHORS.rst
index 3b8504e4df6f5fd03ac9c2bd165d4b81d80b7f39,6e66844dd3defc1c1d598b701cd6f92126394b49..b6cf9d0c960e3a06f4d119465457b1a0a79867e6
--- 1/AUTHORS.rst
--- 2/AUTHORS.rst
+++ b/AUTHORS.rst
@@@ -145,4 -145,4 +145,5 @@@ Patches and Suggestion
  - Pengfei.X <pengphy@gmail.com>
  - Kamil Madac <kamil.madac@gmail.com>
  - Michael Becker <mike@beckerfuffle.com> @beckerfuffle
 -- Константин Подшумок @podshumok
 +- Erik Wickstrom <erik@erikwickstrom.com> @erikwickstrom
++- Константин Подшумок @podshumok

diff --cc requests/adapters.py
Simple merge