Merge remote-tracking branch 'upstream/pull/1826'
authorTom Hughes <tom@compton.nu>
Wed, 18 Apr 2018 17:38:50 +0000 (18:38 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 18 Apr 2018 17:38:50 +0000 (18:38 +0100)

Trivial merge