Merge branch 'hotfix/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jan 2016 17:00:22 +0000 (12:00 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jan 2016 17:00:22 +0000 (12:00 -0500)

Trivial merge