Merge remote-tracking branch 'github/pull/49'
authorTom Hughes <tom@compton.nu>
Wed, 13 Jan 2016 18:16:28 +0000 (18:16 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 13 Jan 2016 18:16:28 +0000 (18:16 +0000)

Trivial merge