Merge branch 'hotfix/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 17:59:21 +0000 (13:59 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 17:59:21 +0000 (13:59 -0400)

Trivial merge