Merge branch 'hotfix/1.0.24' v1.0.24
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 11 Apr 2018 18:58:14 +0000 (14:58 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 11 Apr 2018 18:58:14 +0000 (14:58 -0400)

Trivial merge