Merge branch 'hotfix/1.0.1' v1.0.1
authorLaury GvR <laury@gaslightmedia.com>
Thu, 25 Jun 2015 17:43:00 +0000 (13:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 25 Jun 2015 17:43:00 +0000 (13:43 -0400)

Trivial merge