Merge texmem-0-3-branch.