Fix bug: syntaxhighlighter override the right border.
Merge branch 'master' into gh-pages