Merge remote-tracking branch 'github/pull/53'
authorTom Hughes <tom@compton.nu>
Wed, 20 Jan 2016 18:55:15 +0000 (18:55 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 20 Jan 2016 18:55:15 +0000 (18:55 +0000)

Trivial merge