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

Trivial merge