avoid key error when looking up HTTP_USER_AGENT
correct version
Merge branch 'master' into hotfix/1.1.5

Conflicts:
	CHANGELOG.rst
	setup.py
Merge branch 'hotfix/1.1.5'