fix tests to be compatible with the latest requests version
Merge branch 'master' into dist

Conflicts:
	requirements.txt
	setup.py