Merge branch 'hotfix/1.0.9' v1.0.9
authorLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 20:15:29 +0000 (16:15 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 20:15:29 +0000 (16:15 -0400)

Trivial merge