Merge branch 'hotfix/1.0.9' v1.0.9
authorLaury GvR <laury@gaslightmedia.com>
Wed, 3 Feb 2016 17:37:51 +0000 (12:37 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 3 Feb 2016 17:37:51 +0000 (12:37 -0500)

Trivial merge