Merge remote-tracking branch 'upstream/pull/1950'
authorTom Hughes <tom@compton.nu>
Tue, 28 Aug 2018 16:59:46 +0000 (17:59 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 28 Aug 2018 16:59:46 +0000 (17:59 +0100)

Trivial merge