Update CHANGELOG.md
Merge commit '1897458b542c517f0332d881b03b069e3b5228c9' into scenegraph

Conflicts:
	CHANGELOG.md