Merge branch 'thinguest.v2' into tjjr

Conflicts:
	client/ltsp_config.d/00-puavoltsp-by-hosttype
	debian.default/control