Replaced the setEventClass() method with setEventPrototype() due to the fact that it's easier to control the object type for the event object
Merge remote-tracking branch 'origin/develop' into develop