Merge branch 'mg/texinfo-5'