Tweak CHANGES.md
Reorg b21 in CHANGES.md
Merge branch 'master' into balloon

Conflicts:
	CHANGES.md