Merge branch 'Debianisation' into HEAD

Conflicts:
	Modulefile