Merge remote-tracking branch 'upstream/pull/3343'
authorTom Hughes <tom@compton.nu>
Thu, 14 Oct 2021 23:12:09 +0000 (00:12 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 14 Oct 2021 23:12:09 +0000 (00:12 +0100)

Trivial merge