Merge remote-tracking branch 'upstream/pull/2257'
authorTom Hughes <tom@compton.nu>
Wed, 12 Jun 2019 18:50:52 +0000 (19:50 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 12 Jun 2019 18:50:52 +0000 (19:50 +0100)

Trivial merge