Pushing the 1.0.x changes upstream