Merge branch 'hotfix/1.0.9'
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:44:30 +0000 (15:44 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:44:30 +0000 (15:44 -0500)

Trivial merge