Merge remote-tracking branch 'upstream/pull/1802'
authorTom Hughes <tom@compton.nu>
Mon, 30 Apr 2018 17:56:09 +0000 (18:56 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 30 Apr 2018 17:56:09 +0000 (18:56 +0100)

Trivial merge