Merge origin/master

Conflicts:
	build.xml