updated to version 7.x-0.25
Merge branch 'release/7.x-0.25' into develop