b7e028a
More STR #4461 fixes from upstream. (cherry picked from commit b7255586dee6815ff6bd0e0278882f6fd6a3e7c9) Conflicts: cups-str4461.patch cups.spec