Merge remote branch 'origin/V8_5_asterstudy'

diff --cc src/OBJECT/SMESH_Actor.cxx
Simple merge

diff --cc src/SMESHGUI/SMESHGUI.cxx
Simple merge

diff --cc src/SMESHGUI/SMESHGUI_VTKUtils.cxx
Simple merge

diff --cc src/SMESHGUI/SMESH_msg_en.ts
Simple merge

diff --cc src/SMESHGUI/SMESH_msg_fr.ts
Simple merge

diff --cc src/SMESHGUI/SMESH_msg_ja.ts
Simple merge