Further sanitize data fired in an event
Merge pull request #8687 from techhat/sanitize

Further sanitize data fired in an event