Merge branch 'hotfix/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Thu, 29 Oct 2015 13:16:59 +0000 (09:16 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 29 Oct 2015 13:16:59 +0000 (09:16 -0400)

Trivial merge