Merge pull request #1174 from b4n/escape-markup