Released 1.1.5
Merge remote-tracking branch 'origin/1.1'

Conflicts:
	CHANGELOG.md