Doc build fixes
Merge pull request #1076 from mluessi/fix_doc_build

Doc build fixes