95d92a2 backport 2 upstream commits (r10638, r10642)

Authored and Committed by jpopelka 11 years ago
    backport 2 upstream commits (r10638, r10642)
    
        
file added
+24
file added
+40
file modified
+11 -1