Merge branch 'hotfix/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:34:24 +0000 (15:34 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:34:24 +0000 (15:34 -0500)

Trivial merge