Merge branch 'hotfix/2.0.23' v2.0.23
authorLaury GvR <laury@gaslightmedia.com>
Thu, 31 May 2018 14:11:06 +0000 (10:11 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 31 May 2018 14:11:06 +0000 (10:11 -0400)

Trivial merge