CHANGELOG updates

Conflicts:
	CHANGELOG.md