Changelog updates.

Conflicts:
	CHANGES