Merge remote-tracking branch 'github/pull/183'
authorTom Hughes <tom@compton.nu>
Sat, 15 Sep 2018 13:29:52 +0000 (14:29 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 15 Sep 2018 13:29:52 +0000 (14:29 +0100)

Trivial merge