Merge remote-tracking branch 'alexandre/syntaxhighlighter'