Merge branch 'debian-dbg'