Correct tokenize for empty strings.
Merge pull request #2506 from dereuromark/2.5-string

Correct tokenize for empty strings.