Salome HOME
Merge changes from master branch