Merge branch 'hotfix/1.0.7'
authorLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jan 2016 19:41:42 +0000 (14:41 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jan 2016 19:41:42 +0000 (14:41 -0500)

Trivial merge