Merge remote-tracking branch 'upstream/pull/2423'
authorTom Hughes <tom@compton.nu>
Sun, 24 Nov 2019 11:37:48 +0000 (11:37 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 24 Nov 2019 11:37:48 +0000 (11:37 +0000)

Trivial merge