Merge remote-tracking branch 'origin/master' into build-system

Conflicts:
	build-filelist.xml
	build.xml