Merge remote-tracking branch 'upstream/pull/2890'
authorTom Hughes <tom@compton.nu>
Wed, 21 Oct 2020 19:53:15 +0000 (20:53 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 21 Oct 2020 19:53:15 +0000 (20:53 +0100)

Trivial merge