Merge remote-tracking branch 'upstream/pull/2058'
authorTom Hughes <tom@compton.nu>
Wed, 14 Nov 2018 10:48:18 +0000 (10:48 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 14 Nov 2018 10:48:18 +0000 (10:48 +0000)

Trivial merge