Merge tag '10.42'
authorMatthew Vernon <matthew@debian.org>
Sun, 1 Jan 2023 15:43:12 +0000 (15:43 +0000)
committerMatthew Vernon <matthew@debian.org>
Sun, 1 Jan 2023 15:43:12 +0000 (15:43 +0000)
Upstream version 10.42


Trivial merge