Update to 0.3.0.M6