upstream/3.6.1
350fa156 · Fix cache error formatting code ·