Merge remote-tracking branch 'upstream/pull/2118'
authorTom Hughes <tom@compton.nu>
Wed, 16 Jan 2019 12:22:31 +0000 (12:22 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 16 Jan 2019 12:22:31 +0000 (12:22 +0000)

Trivial merge