Fixed the strange display of Emojis in Emote Menu
Merge remote-tracking branch 'origin/master' into gh-pages