Release v1.1.4
Merge remote-tracking branch 'origin/master' into test-utilities

Conflicts:
	setup.py