1.0.x as dev-master