Merge branch 'hotfix/1.0.8' v1.0.8
authorLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 17:28:19 +0000 (13:28 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 17:28:19 +0000 (13:28 -0400)

Trivial merge