Merge remote-tracking branch 'github/pull/191'
authorTom Hughes <tom@compton.nu>
Tue, 18 Sep 2018 07:31:40 +0000 (08:31 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 18 Sep 2018 07:31:40 +0000 (08:31 +0100)

Trivial merge