Merge branch 'hotfix/1.0.25' master v1.0.25
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 17 Apr 2019 17:56:37 +0000 (13:56 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 17 Apr 2019 17:56:37 +0000 (13:56 -0400)

Trivial merge