Merge remote-tracking branch 'upstream/pull/2060'
authorTom Hughes <tom@compton.nu>
Wed, 14 Nov 2018 13:13:56 +0000 (13:13 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 14 Nov 2018 13:13:56 +0000 (13:13 +0000)

Trivial merge