Merge remote-tracking branch 'upstream/pull/2509'
authorTom Hughes <tom@compton.nu>
Thu, 16 Jan 2020 11:42:12 +0000 (11:42 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 16 Jan 2020 11:42:12 +0000 (11:42 +0000)

Trivial merge