Merge branch 'hotfix/1.0.1' v1.0.1
authorLaury GvR <laury@gaslightmedia.com>
Fri, 20 Mar 2015 15:59:59 +0000 (11:59 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 20 Mar 2015 15:59:59 +0000 (11:59 -0400)

Trivial merge