Make it possible to skip-syntax-highlighting explicitly
Merge branch 'skip-syntax-highlighting'