Merge branch 'debian-installer' into develop

Conflicts:
	README.mdown