Merge remote-tracking branch 'upstream/pull/2039'
authorTom Hughes <tom@compton.nu>
Wed, 31 Oct 2018 18:33:20 +0000 (18:33 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 31 Oct 2018 18:33:20 +0000 (18:33 +0000)

Trivial merge