Merge branch 'patch-1' from github.com/daftano. No issue #
authorTom Clegg <tom@curoverse.com>
Thu, 12 Mar 2015 20:17:25 +0000 (16:17 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 12 Mar 2015 20:17:25 +0000 (16:17 -0400)

Trivial merge