Merge pull request #930 from annando/markdown-encoding