Merge branch 'hotfix/1.0.23' v1.0.23
authorLaury GvR <laury@gaslightmedia.com>
Thu, 28 Jun 2018 20:53:05 +0000 (16:53 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 28 Jun 2018 20:53:05 +0000 (16:53 -0400)

Trivial merge