Released 2.1.1
Merge remote-tracking branch 'origin/2.1'

Conflicts:
	CHANGELOG.md