Merge remote-tracking branch 'upstream/master'
Merge branch 'dev'
Merge remote-tracking branch 'upstream/master'
Merge branch 'dev'
Merge remote-tracking branch 'upstream/master'
Fix: wrong event check causes error
Merge pull request #3 from chr7/master

Fix: wrong event check causes error