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

Trivial merge