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

Trivial merge