Merge remote-tracking branch 'upstream/pull/1894'
authorTom Hughes <tom@compton.nu>
Wed, 6 Jun 2018 13:30:27 +0000 (14:30 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 6 Jun 2018 13:30:27 +0000 (14:30 +0100)

Trivial merge