Merge branch 'hotfix/1.0.24' v1.0.24
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Sep 2018 15:01:24 +0000 (11:01 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Sep 2018 15:01:24 +0000 (11:01 -0400)

Trivial merge