Merge branch 'develop' of https://github.com/atdt/requests into develop

Conflicts:
	AUTHORS.rst

diff --cc AUTHORS.rst
index 0715f2d8eb922257cff0cbcb1147fd6f7e615bea,bf61d06c53d3e979d5ae619bf7aa8c39b595323b..b9c3a6439d388c87dedb547d70d3cc86b89b9658
--- 1/AUTHORS.rst
--- 2/AUTHORS.rst
+++ b/AUTHORS.rst
@@@ -66,4 -66,4 +66,5 @@@ Patches and Suggestion
  - Ed Summers
  - Chris Van Horne
  - Christopher Davis
 -- Jason Emerick
 +- Ori Livneh
++- Jason Emerick