Fix texinfo compilation errors
Merge branch 'master' into devel