bc393cb merge with master

Authored and Committed by raphgro 9 years ago
    merge with master
    
        
file modified
+0 -3