Merge tag '10.40'
authorMatthew Vernon <matthew@debian.org>
Mon, 25 Apr 2022 16:03:54 +0000 (17:03 +0100)
committerMatthew Vernon <matthew@debian.org>
Mon, 25 Apr 2022 16:03:54 +0000 (17:03 +0100)
Upstream version 10.40


Trivial merge