Merge branch 'develop'
Merge branch 'develop'
Minor doc fixes
Merge branch 'robhudson-doc-fixes' into develop