Update master to be for 2.5.0