Merge branch 'hotfix/1.0.23' v1.0.23
authorLaury GvR <laury@gaslightmedia.com>
Wed, 30 Aug 2017 13:33:14 +0000 (09:33 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 30 Aug 2017 13:33:14 +0000 (09:33 -0400)

Trivial merge