Merge branch 'hotfix/1.6.98' v1.6.98
authorLaury GvR <laury@gaslightmedia.com>
Wed, 29 Aug 2018 20:44:01 +0000 (16:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 29 Aug 2018 20:44:01 +0000 (16:44 -0400)

Trivial merge