Merge remote-tracking branch 'upstream/pull/1851'
authorTom Hughes <tom@compton.nu>
Sun, 13 May 2018 14:24:44 +0000 (15:24 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 13 May 2018 14:24:44 +0000 (15:24 +0100)

Trivial merge