Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Jun 2015 12:59:44 +0000 (08:59 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Jun 2015 12:59:44 +0000 (08:59 -0400)

Trivial merge