8d80475 Merge branch 'master' into f18

Merged and Committed by remi 11 years ago
    Merge branch 'master' into f18
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+7 -0
file modified
+16 -5