cf01146 Cherry-pick from master

Authored and Committed by mclasen 13 years ago
    Cherry-pick from master
    
        
file modified
+1 -0
file modified
+18 -28
file modified
+1 -1