Merge branch 'hotfix/1.0.9' v1.0.9
authorLaury GvR <laury@gaslightmedia.com>
Mon, 2 Nov 2015 22:08:49 +0000 (17:08 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 2 Nov 2015 22:08:49 +0000 (17:08 -0500)

Trivial merge