Merge branch 'hotfix/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Mon, 31 Oct 2016 20:09:10 +0000 (16:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 31 Oct 2016 20:09:10 +0000 (16:09 -0400)

Trivial merge