Update to latest 2.6.0