Merge branch 'debian' into debian-packaging