Merge remote-tracking branch 'upstream/pull/2111'
authorTom Hughes <tom@compton.nu>
Wed, 16 Jan 2019 10:15:34 +0000 (10:15 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 16 Jan 2019 10:15:34 +0000 (10:15 +0000)

Trivial merge