181b03c Backport fix for #865078, #865079

Authored and Committed by cheeselee 11 years ago
    Backport fix for #865078, #865079
    
        
file added
+18
file modified
+9 -1