mgubi Includes changes from texmacs/s7_branch_2.1.1