Merge branch 'hotfix/1.2.25' v1.2.25
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 1 May 2017 12:02:24 +0000 (08:02 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 1 May 2017 12:02:24 +0000 (08:02 -0400)

Trivial merge