c61112c add upstream fixes

Authored and Committed by leigh123linux 6 years ago
    add upstream fixes
    
        
file modified
+7 -1