More doc updates
Merge branch 'master' into 1.3.0.4