Merge remote-tracking branch 'upstream/pull/2238'
authorTom Hughes <tom@compton.nu>
Wed, 29 May 2019 16:37:18 +0000 (17:37 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 29 May 2019 16:37:18 +0000 (17:37 +0100)

Trivial merge