211b2a6 fixes for #834110 and #836258 merged upstream

Authored and Committed by jpopelka 11 years ago
    fixes for #834110 and #836258 merged upstream
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1