Bump to 1.8.25