Merge branch 'hotfix/1.0.7' V1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Fri, 18 Sep 2015 16:11:36 +0000 (12:11 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 18 Sep 2015 16:11:36 +0000 (12:11 -0400)

Trivial merge