Merge branch 'debian/sid' into feature/more-fancy-progress