Merge branch 'hotfix/1.0.8' v1.0.8
authorLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jan 2016 19:44:56 +0000 (14:44 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jan 2016 19:44:56 +0000 (14:44 -0500)

Trivial merge