Merge branch 'hotfix/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Wed, 22 Feb 2017 21:26:00 +0000 (16:26 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 22 Feb 2017 21:26:00 +0000 (16:26 -0500)

Trivial merge