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

Trivial merge