merge the (rest of) texmem branch
7 files changed