Merge branch 'hotfix/1.0.25' v1.0.25
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 1 Mar 2018 14:00:38 +0000 (09:00 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 1 Mar 2018 14:00:38 +0000 (09:00 -0500)

Trivial merge