Changelog updates.

(cherry picked from commit b169dc4c272e116e297e101e6279ccbfa99426cb)

Conflicts:
	CHANGELOG.md