Merge branch 'hotfix/1.0.9'
authorLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jan 2016 19:47:30 +0000 (14:47 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jan 2016 19:47:30 +0000 (14:47 -0500)

Trivial merge