Merge branch 'hotfix/1.0.8' v1.0.8
authorLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jan 2016 14:25:21 +0000 (09:25 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jan 2016 14:25:21 +0000 (09:25 -0500)

Trivial merge