Merge remote-tracking branch 'origin/1.1' into merge-1.1

Conflicts:
	CHANGELOG.md