Merge remote-tracking branch 'upstream/pull/2661'
authorTom Hughes <tom@compton.nu>
Wed, 1 Jul 2020 07:28:08 +0000 (08:28 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 1 Jul 2020 07:28:08 +0000 (08:28 +0100)

Trivial merge