Requesting a pull to mozilla:master from k88hudson:events-fix