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

Trivial merge