stop on bad char, not on bad track
Merge branch 'develop' into gh-pages