Merge branch 'master' into logging-and-diagnostics
toggle event logging with key commands
Merge branch 'logging-and-diagnostics'