Merge remote-tracking branch 'upstream/pull/2359'
authorTom Hughes <tom@compton.nu>
Tue, 27 Aug 2019 13:59:53 +0000 (14:59 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 27 Aug 2019 13:59:53 +0000 (14:59 +0100)

Trivial merge