Merge branch 'upstream' of git.debian.org:/git/collab-maint/topgit