Merge branch 'docs' into v1.0