Merge branch 'events'.