Better debugging for bad tokens.
Merge branch 'test' into dev