Merge pull request #2083 from wpaulino/events-module