HTML tokenizer in JSON
auto-merge staging into master