Merge branch 'hotfix/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Mon, 31 Oct 2016 20:43:03 +0000 (16:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 31 Oct 2016 20:43:03 +0000 (16:43 -0400)

Trivial merge