2.5 release
update to 2.6-SNAPSHOT