Merge remote-tracking branch 'upstream/pull/3344'
authorTom Hughes <tom@compton.nu>
Mon, 18 Oct 2021 11:35:38 +0000 (12:35 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 18 Oct 2021 11:35:38 +0000 (12:35 +0100)

Trivial merge