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

Trivial merge