Update master to be 2.5.0-SNAPSHOT