Merge branch 'hotfix/1.0.1' v1.0.1
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 15:07:56 +0000 (11:07 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 15:07:56 +0000 (11:07 -0400)

Trivial merge