Replacing escaped and unescaped tags with the new ones in 5.0.
Merge pull request #931 from kakirigi/fixing-unescaped-echo-tags

Replacing escaped and unescaped tags with the new ones in 5.0.