Merge "correct errors in token alphabet descriptions"