Merge remote-tracking branch 'github/pull/102'
authorTom Hughes <tom@compton.nu>
Thu, 26 Jan 2017 18:29:11 +0000 (18:29 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 26 Jan 2017 18:29:11 +0000 (18:29 +0000)

Trivial merge