Merge branch 'Fix-token-buffer-handling' into 'master'
Fix token buffer indexing
See merge request kde/konsole!61