Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 17 Jul 2014 15:47:14 +0000 (11:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 17 Jul 2014 15:47:14 +0000 (11:47 -0400)

Trivial merge