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

Conflicts:
	AUTHORS.rst

diff --cc AUTHORS.rst
index 0715f2d,bf61d06..b9c3a64
--- 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