Merge branch 'hotfix/1.0.25' v1.0.25
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 10 Oct 2016 17:24:01 +0000 (13:24 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 10 Oct 2016 17:24:01 +0000 (13:24 -0400)

Trivial merge