Merge remote-tracking branch 'github/pull/193'
authorTom Hughes <tom@compton.nu>
Mon, 24 Sep 2018 07:31:58 +0000 (08:31 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 24 Sep 2018 07:31:58 +0000 (08:31 +0100)

Trivial merge