Merge remote-tracking branch 'github/pull/79'
authorTom Hughes <tom@compton.nu>
Sun, 14 Aug 2016 21:18:59 +0000 (22:18 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 14 Aug 2016 21:18:59 +0000 (22:18 +0100)

Trivial merge