Merge remote-tracking branch 'origin/master' into V9_dev

author rnv <rnv@opencascade.com>

Thu, 28 Dec 2017 15:19:17 +0000 (18:19 +0300)

committer rnv <rnv@opencascade.com>

Thu, 28 Dec 2017 15:19:17 +0000 (18:19 +0300)
author rnv <rnv@opencascade.com>
Thu, 28 Dec 2017 15:19:17 +0000 (18:19 +0300)
committer rnv <rnv@opencascade.com>
Thu, 28 Dec 2017 15:19:17 +0000 (18:19 +0300)
diff --cc src/HexoticPlugin/HexoticPlugin_Hexotic.cxx
Simple merge
author	rnv <rnv@opencascade.com>
	Thu, 28 Dec 2017 15:19:17 +0000 (18:19 +0300)
committer	rnv <rnv@opencascade.com>
	Thu, 28 Dec 2017 15:19:17 +0000 (18:19 +0300)