Merge branch 'hotfix/1.0.8'
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:43:07 +0000 (15:43 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:43:07 +0000 (15:43 -0500)

Trivial merge