Updated to 5.0.0.M6-SNAPSHOT