Merge branch 'hotfix/1.0.9' v1.0.9
authorLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jan 2016 14:30:36 +0000 (09:30 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jan 2016 14:30:36 +0000 (09:30 -0500)

Trivial merge