Merge pull request #1567 from AtnNn/master

Allow pointer tokens to have non-null-terminated strings