beryllium Merge pull request #383 from lex111/eventdispatcher-fix …