Merge branch 'hotfix/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 16:19:46 +0000 (12:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 16:19:46 +0000 (12:19 -0400)

Trivial merge