7238440 backport fixes for STR #4191, STR #4194

Authored and Committed by jpopelka 11 years ago
    backport fixes for STR #4191, STR #4194
    
        
file added
+24
file modified
+31 -9
file modified
+9 -2