First set of changes
Fix from XWiki importation
rebased the patch on top of Jean's most recent work and hard-broke lines at 100 characters to simplify patching.
Merge pull request #1 from cjdelisle/review-changes

Perfect, thanks
Merge branch 'master' into add-readme2
texlive-fonts-recommended is needed