5f6b755 add some upstream fixes

Authored and Committed by raveit65 8 years ago
    add some upstream fixes
    
        
file modified
+10 -3
file added
+25