Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Aug 2014 18:38:50 +0000 (14:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Aug 2014 18:38:50 +0000 (14:38 -0400)

Trivial merge