Merge remote-tracking branch 'upstream/pull/2078'
authorTom Hughes <tom@compton.nu>
Wed, 28 Nov 2018 21:11:32 +0000 (21:11 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 28 Nov 2018 21:11:32 +0000 (21:11 +0000)

Trivial merge