Merge branch 'hotfix/1.0.52' v1.0.52
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 20:12:48 +0000 (15:12 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 20:12:48 +0000 (15:12 -0500)

Trivial merge