Merge branch 'hotfix/1.0.23' v1.0.23
authorLaury GvR <laury@gaslightmedia.com>
Fri, 17 Nov 2017 21:38:12 +0000 (16:38 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 17 Nov 2017 21:38:12 +0000 (16:38 -0500)

Trivial merge