Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 21 Apr 2015 14:14:47 +0000 (10:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 21 Apr 2015 14:14:47 +0000 (10:14 -0400)

Trivial merge