Merge branch 'master' into V9_dev

diff --cc bin/gui_setenv.py
Simple merge

diff --cc src/LightApp/LightApp_Application.cxx
Simple merge

diff --cc src/LightApp/LightApp_Application.h
Simple merge

diff --cc src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
Simple merge

diff --cc src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
Simple merge

diff --cc src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
Simple merge

diff --cc src/SalomeApp/SalomeApp_Application.cxx
Simple merge