Merge branch 'hotfix/1.0.9' v1.0.9
authorLaury GvR <laury@gaslightmedia.com>
Wed, 28 Dec 2016 22:11:50 +0000 (17:11 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 28 Dec 2016 22:11:50 +0000 (17:11 -0500)

Trivial merge