Tagging version 7.x-2.5.
Merge branch 'release/7.x-2.5' into develop