Bump master to 2.5.