Merge remote-tracking branch 'upstream/pull/2434'
authorTom Hughes <tom@compton.nu>
Wed, 20 Nov 2019 19:17:29 +0000 (19:17 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 20 Nov 2019 19:17:29 +0000 (19:17 +0000)

Trivial merge