Merge branch 'release/1.0.24' v1.0.24
authorLaury GvR <laury@gaslightmedia.com>
Thu, 28 Jun 2018 20:58:23 +0000 (16:58 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 28 Jun 2018 20:58:23 +0000 (16:58 -0400)

Trivial merge