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

Trivial merge