Merge remote-tracking branch 'upstream/pull/2270'
authorTom Hughes <tom@compton.nu>
Thu, 20 Jun 2019 17:58:38 +0000 (18:58 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 20 Jun 2019 17:58:38 +0000 (18:58 +0100)

Trivial merge