Fixed lack of backwards compatibility
Fixed newline handling when Markdown is disabled
Merge branch 'master' into gh-pages