update branches/2.5 from beta1 to the 2.5 release