Merge texmate master