merged
Merge branch 'master' into debian

Conflicts:
	src/build/install.sh