Release branch 1.0

Pick up 1.0.1 fixes