Merge branch 'hotfix/1.0.35' master v1.0.35
authorLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jun 2018 19:38:47 +0000 (15:38 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jun 2018 19:38:47 +0000 (15:38 -0400)

Trivial merge