Merge remote-tracking branch 'upstream/pull/2189'
authorTom Hughes <tom@compton.nu>
Wed, 27 Mar 2019 12:07:11 +0000 (12:07 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 27 Mar 2019 12:07:11 +0000 (12:07 +0000)

Trivial merge