Updated b21 in CHANGES.md
Update version in build.xml to b21
Merge branch 'master' into uberbranch

Conflicts:
	CHANGES.md