Updated version number and change log
Merge branch 'release/2.2.5' into develop