Fixed tabs of emoji menu
Do not affect Emoji menu
Merge remote-tracking branch 'origin/master' into gh-pages