Update master to 2.5.0