Merge pull request #2608 from Spamcat/master

Fixes
Fix for mouse emotes, courtesy of nan0desu.
#2613