update to 7.x-2.25-dev