Merge branch 'markdown'