Merge branch 'issue/139' into issue/139-asc

Conflicts:
	build.xml