Merge pull request #1787 from wpaulino/async-event-handler