Merge remote-tracking branch 'upstream/pull/1800'
authorTom Hughes <tom@compton.nu>
Mon, 2 Apr 2018 14:18:11 +0000 (15:18 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 2 Apr 2018 14:18:11 +0000 (15:18 +0100)

Trivial merge