Some small doc fixes only relevant on the master branch
Merge pull request #3595 from jenshnielsen/master_doc_fixes

DOC : Some small doc fixes only relevant on the master branch