Tweak CHANGES.md
Merge branch 'master' into squared

Conflicts:
	CHANGES.md