Merge diverged master

Failed to pull before working.
4 jobs for master in 7 minutes and 33 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #116088
build

00:04:06

 
  Test
passed #116090
autopkgtest

00:02:13

passed #116089
lintian

00:02:05

passed #116091
piuparts

00:03:25