Merge remote-tracking branch 'upstream/pull/3226'
authorTom Hughes <tom@compton.nu>
Wed, 16 Jun 2021 17:07:38 +0000 (18:07 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 16 Jun 2021 17:07:38 +0000 (18:07 +0100)

Trivial merge