Merge branch 'debian/sid' into feature/apt-manpage