Fixed Web IDL tokenization rule
Fixed handling of identifiers
auto-merge staging into master