Summary of changes: a9af5f3... 6.4.2, fix ftbfs (*) 0b2a31f... SOLVE MAN PAGE CONFLICT AND CORRECT ENCODING (*) 7a437c3... Merge branch 'master' into f17 (*) This commit already existed in another branch; no separate mail sent