Merge branch 'hotfix/1.0.8' v1.0.8
authorLaury GvR <laury@gaslightmedia.com>
Mon, 31 Oct 2016 20:51:08 +0000 (16:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 31 Oct 2016 20:51:08 +0000 (16:51 -0400)

Trivial merge