Merge branch 'hotfix/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Mon, 6 Mar 2017 14:01:51 +0000 (09:01 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 6 Mar 2017 14:01:51 +0000 (09:01 -0500)

Trivial merge