Merge branch 'debian/unstable' into release