Merge remote-tracking branch 'upstream/pull/2079'
authorTom Hughes <tom@compton.nu>
Tue, 4 Dec 2018 20:41:34 +0000 (20:41 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 4 Dec 2018 20:41:34 +0000 (20:41 +0000)

Trivial merge