Merge branch 'master' from github.com/daftano. No issue #
authorTom Clegg <tom@curoverse.com>
Mon, 16 Mar 2015 14:18:19 +0000 (10:18 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 16 Mar 2015 14:18:19 +0000 (10:18 -0400)

Trivial merge