Merge branch 'debian/master' into debian/backports