Merge master into java7

Conflicts:
	build.xml