Merge remote-tracking branch 'upstream/pull/2152'
authorTom Hughes <tom@compton.nu>
Wed, 20 Feb 2019 23:57:50 +0000 (23:57 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 20 Feb 2019 23:57:50 +0000 (23:57 +0000)

Trivial merge