Fix conflicts with Emote Menu toggle
Merge remote-tracking branch 'origin/master' into gh-pages