Merge branch 'hotfix/1.0.9' V1.0.9
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Aug 2014 18:36:18 +0000 (14:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Aug 2014 18:36:18 +0000 (14:36 -0400)

Trivial merge