Fixed insecure HTML parsing when Markdown is disabled
Merge branch 'master' into gh-pages