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

Trivial merge