fix build
Merge branch 'master' into live

Conflicts:
	build/build.xml