Merge remote-tracking branch 'upstream/pull/2400'
authorTom Hughes <tom@compton.nu>
Mon, 21 Oct 2019 09:31:06 +0000 (10:31 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 21 Oct 2019 09:31:06 +0000 (10:31 +0100)

Trivial merge