Merge remote-tracking branch 'upstream/pull/2548'
authorTom Hughes <tom@compton.nu>
Wed, 18 Mar 2020 20:15:06 +0000 (20:15 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 18 Mar 2020 20:15:06 +0000 (20:15 +0000)

Trivial merge