Update CHANGELOG for #2630

Conflicts:
	CHANGELOG.md