fixes bug 1046403 - Event Manager Chronological Ordering
Merge branch 'bug-1046403-event-manager-chronological-ordering'