Merge remote-tracking branch 'upstream/pull/2596'
authorTom Hughes <tom@compton.nu>
Wed, 22 Apr 2020 12:44:17 +0000 (13:44 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 22 Apr 2020 12:44:17 +0000 (13:44 +0100)

Trivial merge