Merge branch 'hotfix/1.0.1' v1.0.1
authorLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 16:19:53 +0000 (12:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 16:19:53 +0000 (12:19 -0400)

Trivial merge