Merge remote-tracking branch 'upstream/pull/2135'
authorTom Hughes <tom@compton.nu>
Wed, 6 Feb 2019 18:21:50 +0000 (18:21 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 6 Feb 2019 18:21:50 +0000 (18:21 +0000)

Trivial merge