Merge remote-tracking branch 'upstream/pull/2398'
authorTom Hughes <tom@compton.nu>
Wed, 16 Oct 2019 13:20:44 +0000 (14:20 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 16 Oct 2019 13:20:44 +0000 (14:20 +0100)

Trivial merge