Merge remote-tracking branch 'github/pull/89'
authorTom Hughes <tom@compton.nu>
Wed, 7 Sep 2016 10:34:05 +0000 (11:34 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 7 Sep 2016 10:34:05 +0000 (11:34 +0100)

Trivial merge