xml in work
Merge remote-tracking branch 'origin/master'

Conflicts:
	mustached-nemesis/build.xml