Merge branch 'docs' into 3.0.x