Merge pull request #925 from annando/markdown-escape