Merge branch 'hotfix/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:38:31 +0000 (15:38 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:38:31 +0000 (15:38 -0500)

Trivial merge