Merge remote-tracking branch 'upstream/pull/2330'
authorTom Hughes <tom@compton.nu>
Fri, 26 Jul 2019 17:01:50 +0000 (18:01 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 26 Jul 2019 17:01:50 +0000 (18:01 +0100)

Trivial merge