Fix #946
Bump version to 8.2.25
Bump version to 8.2.25-dev