Upgrade to 2.5-RC2