Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 14:45:45 +0000 (10:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 14:45:45 +0000 (10:45 -0400)

Trivial merge