Merge branch 'hotfix/2.0.25' v2.0.25
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 31 May 2018 20:14:01 +0000 (16:14 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 31 May 2018 20:14:01 +0000 (16:14 -0400)

Trivial merge