Security fixes for v1.0.x