Merge branch 'hotfix/1.0.39' master v1.0.39
authorLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jun 2018 18:52:50 +0000 (14:52 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jun 2018 18:52:50 +0000 (14:52 -0400)

Trivial merge