6253a33 add some upstream fixes

Authored and Committed by raveit65 5 years ago
    add some upstream fixes
    
        
file modified
+12 -1
file added
+25