Merge remote-tracking branch 'upstream/pull/2117'
authorTom Hughes <tom@compton.nu>
Wed, 16 Jan 2019 11:39:18 +0000 (11:39 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 16 Jan 2019 11:39:18 +0000 (11:39 +0000)

Trivial merge