Salome HOME
Merge branch 'origin/fixes_for_960'