Merge branch 'hotfix/1.2.25' v1.2.25
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Feb 2018 14:20:06 +0000 (09:20 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Feb 2018 14:20:06 +0000 (09:20 -0500)

Trivial merge