Merge branch 'hotfix-2.3.36' into develop
Logging of admin emails and auth refresh

- admin emails now generate log entries
- authentication is refreshed on activity
Merge branch 'hotfix-2.3.37'