Upgrade to 2.5

We had a discussion about this ages ago (upgrading and merging). Not sure if this is exactly what you had in mind.