Merge master branch into V9_dev

author rnv <rnv@opencascade.com>

Thu, 3 Aug 2017 15:22:33 +0000 (18:22 +0300)

committer rnv <rnv@opencascade.com>

Thu, 3 Aug 2017 15:23:59 +0000 (18:23 +0300)
author rnv <rnv@opencascade.com>
Thu, 3 Aug 2017 15:22:33 +0000 (18:22 +0300)
committer rnv <rnv@opencascade.com>
Thu, 3 Aug 2017 15:23:59 +0000 (18:23 +0300)
diff --cc src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx
Simple merge
author	rnv <rnv@opencascade.com>
	Thu, 3 Aug 2017 15:22:33 +0000 (18:22 +0300)
committer	rnv <rnv@opencascade.com>
	Thu, 3 Aug 2017 15:23:59 +0000 (18:23 +0300)