Merge remote-tracking branch 'upstream/pull/2191'
authorTom Hughes <tom@compton.nu>
Wed, 27 Mar 2019 18:10:09 +0000 (18:10 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 27 Mar 2019 18:10:09 +0000 (18:10 +0000)

Trivial merge