Merge branch 'master' into ST3
Fix failure when no syntaxes are set.
Merge branch 'ST3'