Merge branch 'hotfix/1.0.29' v1.0.29
authorLaury GvR <laury@gaslightmedia.com>
Wed, 18 Jul 2018 17:48:05 +0000 (13:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 18 Jul 2018 17:48:05 +0000 (13:48 -0400)

Trivial merge