Merge branch 'hotfix/1.0.23' v1.0.23
authorLaury GvR <laury@gaslightmedia.com>
Tue, 5 Dec 2017 19:53:40 +0000 (14:53 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 5 Dec 2017 19:53:40 +0000 (14:53 -0500)

Trivial merge