Merge remote-tracking branch 'upstream/pull/2250'
authorTom Hughes <tom@compton.nu>
Wed, 5 Jun 2019 16:18:55 +0000 (17:18 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 5 Jun 2019 16:18:55 +0000 (17:18 +0100)

Trivial merge