Merge branch 'robhudson-doc-fixes' into develop