Merge branch 'hotfix/1.0.9' v1.0.9
authorLaury GvR <laury@gaslightmedia.com>
Wed, 1 Jul 2015 18:43:35 +0000 (14:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 1 Jul 2015 18:43:35 +0000 (14:43 -0400)

Trivial merge