Merge branch 'hotfix/1.0.9'
authorLaury GvR <laury@gaslightmedia.com>
Tue, 3 Nov 2015 14:08:52 +0000 (09:08 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 3 Nov 2015 14:08:52 +0000 (09:08 -0500)

Trivial merge