Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Sep 2014 16:02:18 +0000 (12:02 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Sep 2014 16:02:18 +0000 (12:02 -0400)

Trivial merge