Merge pull request #7286 from MrPetovan/bug/invading-smilies