Merge branch 'hotfix/1.0.8' v1.0.8
authorLaury GvR <laury@gaslightmedia.com>
Wed, 28 Dec 2016 22:06:58 +0000 (17:06 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 28 Dec 2016 22:06:58 +0000 (17:06 -0500)

Trivial merge