changes for of74
changes to fit current of event system
Merge branch 'master' into develop

Conflicts:
	example/config.make