Merge remote-tracking branch 'github/pull/76'
authorTom Hughes <tom@compton.nu>
Thu, 4 Aug 2016 20:50:49 +0000 (21:50 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 4 Aug 2016 20:50:49 +0000 (21:50 +0100)

Trivial merge