Merge remote-tracking branch 'upstream/pull/2237'
authorTom Hughes <tom@compton.nu>
Thu, 30 May 2019 08:20:37 +0000 (09:20 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 30 May 2019 08:20:37 +0000 (09:20 +0100)

Trivial merge