charref tokenizer defs
auto-merge staging into master