Merge branch 'debian': Imported 3.0~b6-1 from Debian Live