Merge remote-tracking branch 'github/pull/118'
authorTom Hughes <tom@compton.nu>
Fri, 24 Mar 2017 00:00:36 +0000 (00:00 +0000)
committerTom Hughes <tom@compton.nu>
Fri, 24 Mar 2017 00:00:36 +0000 (00:00 +0000)

Trivial merge