Rebase for changes in the Debian master branch