sync with texmem branch