Merge remote-tracking branch 'github/pull/74'
authorTom Hughes <tom@compton.nu>
Thu, 28 Jul 2016 17:41:33 +0000 (18:41 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 28 Jul 2016 17:41:33 +0000 (18:41 +0100)

Trivial merge