Merge 2.10.x into master

Conflicts:
	build.xml