Set max events limit
Merge pull request #441 from mmeisinger/fix1504_dep_r2

Set max events limit