bumping version
Merge branch 'release/2.5' into development