Merge remote-tracking branch 'upstream/pull/2440'
authorTom Hughes <tom@compton.nu>
Wed, 20 Nov 2019 19:01:13 +0000 (19:01 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 20 Nov 2019 19:01:13 +0000 (19:01 +0000)

Trivial merge