Merge remote-tracking branch 'github/pull/165'
authorTom Hughes <tom@compton.nu>
Mon, 25 Jun 2018 14:20:51 +0000 (15:20 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 25 Jun 2018 14:20:51 +0000 (15:20 +0100)

Trivial merge