Bumped version numbers
Merge branch 'release/2.5.0' into develop
Bumped version numbers