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

Trivial merge