"Mutualize button save configuration"
Merge branch 'master/chiba2' into rel/chiba2.1
"Change version number to Chiba 2.1"