Merge branch 'for-2.6.38/event-handling' into for-2.6.38/core