oops. version should be 2.5 release
merge and fix version