Merge branch 'release/1.0.24' v1.0.24
authorLaury GvR <laury@gaslightmedia.com>
Mon, 20 Nov 2017 18:32:32 +0000 (13:32 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 20 Nov 2017 18:32:32 +0000 (13:32 -0500)

Trivial merge