Merge branch 'hotfix/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Tue, 29 Dec 2015 22:01:22 +0000 (17:01 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 29 Dec 2015 22:01:22 +0000 (17:01 -0500)

Trivial merge