Merge branch 'hotfix/1.0.29' v1.0.29
authorLaury GvR <laury@gaslightmedia.com>
Wed, 2 May 2018 20:05:40 +0000 (16:05 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 2 May 2018 20:05:40 +0000 (16:05 -0400)

Trivial merge