Update to 3.0.0.M6