e1f317b latest changes from upstream

Authored and Committed by remi 8 years ago
    latest changes from upstream
    
        
file modified
+2 -2
file modified
+17 -5
file modified
+1 -1