Merge branch 'master' into java7

Conflicts:
	build.xml