v2.25.6.13
Merge pull request #560 from shaitan/v2.25

v2.25.6.13