Fixed typo
Bumped version
Merge branch 'hotfix-1.6.25'