SECURITY: Escape strings in logs
Merge remote-tracking branch 'origin/stable' into pkgr