Merge remote-tracking branch 'upstream/pull/2688'
authorTom Hughes <tom@compton.nu>
Sat, 4 Jul 2020 09:39:07 +0000 (10:39 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 4 Jul 2020 09:39:07 +0000 (10:39 +0100)

Trivial merge