Upgrade to 2.5

Upgrade to the 2.5 release