Merge remote-tracking branch 'upstream/pull/2108'
authorTom Hughes <tom@compton.nu>
Wed, 9 Jan 2019 17:24:28 +0000 (17:24 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 9 Jan 2019 17:24:28 +0000 (17:24 +0000)

Trivial merge