Merge branch 'release/1.1.4' into develop
Prep for release
Merge branch 'release/1.1.5'
Merge branch 'release/1.1.5' into develop
Missing url import
Prep for release
Merge branch 'release/1.1.6'
correct version
Merge branch 'master' into hotfix/1.1.5

Conflicts:
	CHANGELOG.rst
	setup.py