Updating version number.
Merge branch 'release/7.x-1.25' into develop