Merge branch 'release/1.0.24' v1.0.24
authorLaury GvR <laury@gaslightmedia.com>
Tue, 6 Feb 2018 16:46:34 +0000 (11:46 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 6 Feb 2018 16:46:34 +0000 (11:46 -0500)

Trivial merge