merge
Merge branch 'joergs/debian-dh_installinit2' into playground