0203fd8 backport fixes for STR #4072, STR #4124, also upstream commits r10572, r10573

4 files Authored by jpopelka 11 years ago, Committed by twaugh 11 years ago,
    backport fixes for STR #4072, STR #4124, also upstream commits r10572, r10573
    
        
file added
+30
file added
+118
file added
+12
file modified
+17 -0