b725558 More STR #4461 fixes from upstream.

Authored and Committed by twaugh 6 years ago
    More STR #4461 fixes from upstream.
    
        
file modified
+83 -3
file modified
+4 -1