Merge remote-tracking branch 'upstream/pull/2506'
authorTom Hughes <tom@compton.nu>
Wed, 15 Jan 2020 14:18:11 +0000 (14:18 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 15 Jan 2020 14:18:11 +0000 (14:18 +0000)

Trivial merge