Upgrade version and update changes
Merge branch 'develop' into release/2.5.0
Update CHANGES.rst
Merge tag 'release/2.5.0' into release/2.5.1