finalized documentation, completes #3706
Merge branch 'master' into develop