Add ability to stop the propogation of events
Merge branch 'dev' into event-stops
Merge branch 'event-stops'