Merge branch 'hotfix/1.0.24' v1.0.24
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 22 Feb 2018 21:15:16 +0000 (16:15 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 22 Feb 2018 21:15:16 +0000 (16:15 -0500)

Trivial merge