add changelog entry for 1.2.1

Conflicts:
	CHANGELOG.rst