c412810 update from 3.1.0 snapshot to final

Authored and Committed by remi 8 years ago
    update from 3.1.0 snapshot to final
    
        
file modified
+1 -0
file modified
+5 -9
file modified
+1 -1