Allow audit logging to be enabled/disabled by config
Merge branch 'disable-audit' into stage