fix build with --disable-doc
Merge branch 'master' into manual
work in progress