Merge remote-tracking branch 'upstream/pull/2504'
authorTom Hughes <tom@compton.nu>
Wed, 15 Jan 2020 12:16:24 +0000 (12:16 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 15 Jan 2020 12:16:24 +0000 (12:16 +0000)

Trivial merge