Updated for 1.0.25 release.