Merge remote-tracking branch 'upstream/pull/2153'
authorTom Hughes <tom@compton.nu>
Thu, 21 Feb 2019 23:00:55 +0000 (23:00 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 21 Feb 2019 23:00:55 +0000 (23:00 +0000)

Trivial merge