Merge branch 'hotfix/1.0.8' v1.0.8
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 18:02:30 +0000 (14:02 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 18:02:30 +0000 (14:02 -0400)

Trivial merge