Merge branch 'upstream-unstable' into debian-unstable

3 jobs for debian-unstable in 6 minutes and 30 seconds (queued for 4 seconds)