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

Trivial merge