FIX: cleaner event limit display
Merge branch 'master' into production