Merge branch 'hotfix/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Mon, 23 Nov 2015 18:04:24 +0000 (13:04 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 23 Nov 2015 18:04:24 +0000 (13:04 -0500)

Trivial merge