Merge remote-tracking branch 'upstream/pull/1960'
authorTom Hughes <tom@compton.nu>
Wed, 29 Aug 2018 07:43:08 +0000 (08:43 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 29 Aug 2018 07:43:08 +0000 (08:43 +0100)

Trivial merge