Added some docs and funtionaly to the function and changed the JavaCharToken class.
Merge commit '11954f02926f26453aa050412dc9068f1c937ebe'

gn

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.