230fff Backport fixes from git

Authored and Committed by Simone Caronni 10 years ago
    Backport fixes from git
    
        
file added
+2207
file modified
+49 -45