Merge pull request #6933 from MrPetovan/bug/smilies-wrong-escape