Removed special char fix to avoid insertion of malicious content.
Will have to be fixed in the editor.
Merge branch 'master' into api-1.2