Merge remote-tracking branch 'upstream/pull/2087'
authorTom Hughes <tom@compton.nu>
Thu, 13 Dec 2018 15:49:34 +0000 (15:49 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 13 Dec 2018 15:49:34 +0000 (15:49 +0000)

Trivial merge