Issue #162 - Use the same parser for all markdown
Merge branch 'issue-162-wiki-display-bug'