Merge branch 'hotfix/1.0.8'
authorLaury GvR <laury@gaslightmedia.com>
Mon, 23 Nov 2015 18:10:59 +0000 (13:10 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 23 Nov 2015 18:10:59 +0000 (13:10 -0500)

Trivial merge