Resync with git version of Debian