Merge remote-tracking branch 'upstream/pull/2313'
authorTom Hughes <tom@compton.nu>
Tue, 16 Jul 2019 10:56:13 +0000 (11:56 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 16 Jul 2019 10:56:13 +0000 (11:56 +0100)

Trivial merge