Merge remote-tracking branch 'upstream/pull/3279'
authorTom Hughes <tom@compton.nu>
Wed, 28 Jul 2021 19:18:07 +0000 (20:18 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 28 Jul 2021 19:18:07 +0000 (20:18 +0100)

Trivial merge