Merge remote-tracking branch 'upstream/pull/2084'
authorTom Hughes <tom@compton.nu>
Wed, 12 Dec 2018 18:40:13 +0000 (18:40 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 12 Dec 2018 18:40:13 +0000 (18:40 +0000)

Trivial merge