Conflicts:
	CHANGES.rst