Merge branch 'hotfix/1.0.55' v1.0.55
authorLaury GvR <laury@gaslightmedia.com>
Wed, 14 Mar 2018 20:38:18 +0000 (16:38 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 14 Mar 2018 20:38:18 +0000 (16:38 -0400)

Trivial merge