Merge branch 'master' of git.debian.org:/git/collab-maint/packaging-tutorial