bumped changelog [#2.5.0]
Merge branch 'release/2.5.0' into develop