f0ef8cf Rebased to latest upstream sources

Authored and Committed by omular 4 years ago
    Rebased to latest upstream sources
    
        
file modified
+2 -0
file modified
+8 -5
file modified
+2 -2