Merge branch 'build-cleanup-2.10' into master

Conflicts:
	build.xml
Merge master.

Conflicts:
	build.xml