Update the CHANGELOG for 7.2.1

Conflicts:
	CHANGELOG