Merge branch 'thinguest.v2' into tjjr

Conflicts:
	debian.default/control
Merge remote-tracking branch 'origin/nslcd' into tjjr

Conflicts:
	debian.default/control