Merge "Second attempt at avoiding infinite loop in PathCache::trim() Bug #10347089" into klp-dev