Merge branch 'hotfix/1.0.9' v1.0.9
authorLaury GvR <laury@gaslightmedia.com>
Mon, 31 Oct 2016 21:14:35 +0000 (17:14 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 31 Oct 2016 21:14:35 +0000 (17:14 -0400)

Trivial merge