Merge remote-tracking branch 'upstream/pull/1955'
authorTom Hughes <tom@compton.nu>
Thu, 11 Oct 2018 16:41:47 +0000 (17:41 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 11 Oct 2018 16:41:47 +0000 (17:41 +0100)

Trivial merge