Merge remote-tracking branch 'upstream/pull/2362'
authorTom Hughes <tom@compton.nu>
Wed, 28 Aug 2019 16:49:35 +0000 (17:49 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 28 Aug 2019 16:49:35 +0000 (17:49 +0100)

Trivial merge