Update tokenizer from master.