Merge branch 'master' into V9_dev

author rnv <rnv@opencascade.com>

Thu, 20 Jul 2017 08:50:35 +0000 (11:50 +0300)

committer rnv <rnv@opencascade.com>

Thu, 20 Jul 2017 08:50:35 +0000 (11:50 +0300)
author rnv <rnv@opencascade.com>
Thu, 20 Jul 2017 08:50:35 +0000 (11:50 +0300)
committer rnv <rnv@opencascade.com>
Thu, 20 Jul 2017 08:50:35 +0000 (11:50 +0300)
diff --cc src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx
Simple merge
author	rnv <rnv@opencascade.com>
	Thu, 20 Jul 2017 08:50:35 +0000 (11:50 +0300)
committer	rnv <rnv@opencascade.com>
	Thu, 20 Jul 2017 08:50:35 +0000 (11:50 +0300)