Merge remote-tracking branch 'upstream/pull/2080'
authorTom Hughes <tom@compton.nu>
Wed, 5 Dec 2018 08:23:54 +0000 (08:23 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 5 Dec 2018 08:23:54 +0000 (08:23 +0000)

Trivial merge