Added a protected accessor to the event class
Merge master