Merge branch 'develop' of git://github.com/siebenschlaefer/requests into develop

Conflicts:
	AUTHORS.rst

diff --cc AUTHORS.rst
index b1e8ec23e691d16f588c55f588f3469df6cd7cde,915826a0445d32b9f12dae57fb886d55d9c5608f..1ff531480002d612a395bbf91bccb3e92108782f
--- 1/AUTHORS.rst
--- 2/AUTHORS.rst
+++ b/AUTHORS.rst
@@@ -105,7 -105,4 +105,8 @@@ Patches and Suggestion
  - Danilo Bargen (gwrtheyrn)
  - Torsten Landschoff
  - Michael Holler (apotheos)
 +- Timnit Gebru
 +- Sarah Gonzalez
 +- Victoria Mo
 +- Leila Muhtasib
+ - Matthias Rahlf <matthias@webding.de>

diff --cc requests/models.py
Simple merge