86abdbd merge with master

Merged and Committed by raphgro 9 years ago
    merge with master
    
        
file modified
+1 -0
file modified
+132 -60
file modified
+1 -0