Merge branch 'hotfix/1.0.8' v1.0.8
authorLaury GvR <laury@gaslightmedia.com>
Mon, 14 Sep 2015 21:31:30 +0000 (17:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 14 Sep 2015 21:31:30 +0000 (17:31 -0400)

Trivial merge