Merge branch 'hotfix/1.0.24'
authorLaury GvR <laury@gaslightmedia.com>
Mon, 20 Nov 2017 16:59:24 +0000 (11:59 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 20 Nov 2017 16:59:24 +0000 (11:59 -0500)

Trivial merge