Merge remote-tracking branch 'upstream/pull/2190'
authorTom Hughes <tom@compton.nu>
Thu, 28 Mar 2019 08:24:04 +0000 (08:24 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 28 Mar 2019 08:24:04 +0000 (08:24 +0000)

Trivial merge