Merge remote-tracking branch 'github/pull/52'
authorTom Hughes <tom@compton.nu>
Tue, 19 Jan 2016 10:08:41 +0000 (10:08 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 19 Jan 2016 10:08:41 +0000 (10:08 +0000)

Trivial merge