2756523 merge changelog from master

Merged and Committed by raphgro 4 years ago
    merge changelog from master
    
        
file modified
+4 -0
file modified
+15 -2
file modified
+1 -1