Merge pull request #3460 from lionello/master

Fixed offsets in comments for enum TOK