Fix parse error on yaml lexer
Merge branch 'master' into bugfix.yaml-error
Merge branch 'bugfix.yaml-error'