Update for the v2.5.0p2 release.