Merge branch 'hotfix/1.0.1' master v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Aug 2014 17:46:12 +0000 (13:46 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Aug 2014 17:46:12 +0000 (13:46 -0400)

Trivial merge