Merge branch 'release/1.1.24' v1.1.24
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 19:03:31 +0000 (14:03 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 19:03:31 +0000 (14:03 -0500)

Trivial merge