merge from texman branch
27 files changed