Merge remote-tracking branch 'upstream/pull/2381'
authorTom Hughes <tom@compton.nu>
Wed, 19 Feb 2020 19:11:32 +0000 (19:11 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 19 Feb 2020 19:11:32 +0000 (19:11 +0000)

Trivial merge