Merge branch 'hotfix/1.2.29' v1.2.29
authorLaury GvR <laury@gaslightmedia.com>
Wed, 18 Apr 2018 17:07:44 +0000 (13:07 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 18 Apr 2018 17:07:44 +0000 (13:07 -0400)

Trivial merge