Merge branch 'v1.0.x'