Update to the latest 2.5.x