Fix edge case behavior of nextTokenOnChannel and previousTokenOnChannel (fixes #622, fixes #544)
Merge pull request #626 from sharwell/fix-622

Fix edge case behavior of nextTokenOnChannel and previousTokenOnChannel