Merge branch 'master' into develop
Fixes to event naming
Fixed compilation (and reformatted)
Merge branch 'pdavis68_develop' into develop
Release 1.9.3