Bump version to 2.5.0
Merge branch 'release/2.5.0'
Merge tag '2.5.0' into develop

2.5.0