Merge branch 'hotfix/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Wed, 16 Aug 2017 20:30:26 +0000 (16:30 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 16 Aug 2017 20:30:26 +0000 (16:30 -0400)

Trivial merge