Merge branch 'hotfix/1.0.24' v1.0.24
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 3 May 2018 20:20:35 +0000 (16:20 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 3 May 2018 20:20:35 +0000 (16:20 -0400)

Trivial merge