Merge branch 'hotfix/1.0.25' v1.0.25
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 18 Mar 2016 20:13:34 +0000 (16:13 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 18 Mar 2016 20:13:34 +0000 (16:13 -0400)

Trivial merge