Merge remote-tracking branch 'upstream/pull/2053'
authorTom Hughes <tom@compton.nu>
Wed, 7 Nov 2018 15:55:38 +0000 (15:55 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 7 Nov 2018 15:55:38 +0000 (15:55 +0000)

Trivial merge