Bumped changelog
Merge branch 'release/2.5.0'
Merge branch 'master' into 2.5