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

Trivial merge