Upgrade to 2.5RC5