Merge remote-tracking branch 'upstream/pull/2267'
authorTom Hughes <tom@compton.nu>
Thu, 20 Jun 2019 18:02:31 +0000 (19:02 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 20 Jun 2019 18:02:31 +0000 (19:02 +0100)

Trivial merge