Update master to be v3.0-dev