Wiki markup parsing update.
Merge branch 'master' into development