Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Apr 2015 15:59:53 +0000 (11:59 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Apr 2015 15:59:53 +0000 (11:59 -0400)

Trivial merge