Use own dox fork with fixes
Merge branch 'master' into gh-pages
Updating documents