b3383d4 gathered various patches from usptream

Authored and Committed by jvanek 6 years ago
    gathered various patches from usptream
    
        
file modified
+9 -4
file added
+794