Post/working towards 3.0.0 rc.1