upgrade to 2.5beta4