Merge branch 'hotfix/1.0.1' v1.0.1
authorLaury GvR <laury@gaslightmedia.com>
Tue, 2 Jun 2015 13:03:11 +0000 (09:03 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 2 Jun 2015 13:03:11 +0000 (09:03 -0400)

Trivial merge