Merge branch 'hotfix/1.0.28' v1.0.28
authorLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jun 2018 20:37:28 +0000 (16:37 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jun 2018 20:37:28 +0000 (16:37 -0400)

Trivial merge