93d65f0 backport 2 upstream commits (r10572, r10573)

Authored and Committed by jpopelka 11 years ago
    backport 2 upstream commits (r10572, r10573)
    
        
file modified
+114 -53
file added
+30
file modified
+9 -1