Update CHANGELOG.md
Merge branch 'master' into PIM-2247

Conflicts:
	CHANGELOG.md