Merge remote-tracking branch 'upstream/pull/2167'
authorTom Hughes <tom@compton.nu>
Wed, 6 Mar 2019 17:23:46 +0000 (17:23 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 6 Mar 2019 17:23:46 +0000 (17:23 +0000)

Trivial merge