Merge branch 'master' into V9_dev

author rnv <rnv@opencascade.com>

Wed, 19 Jul 2017 15:22:32 +0000 (18:22 +0300)

committer rnv <rnv@opencascade.com>

Wed, 19 Jul 2017 15:22:32 +0000 (18:22 +0300)
author rnv <rnv@opencascade.com>
Wed, 19 Jul 2017 15:22:32 +0000 (18:22 +0300)
committer rnv <rnv@opencascade.com>
Wed, 19 Jul 2017 15:22:32 +0000 (18:22 +0300)
diff --cc src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
Simple merge
author	rnv <rnv@opencascade.com>
	Wed, 19 Jul 2017 15:22:32 +0000 (18:22 +0300)
committer	rnv <rnv@opencascade.com>
	Wed, 19 Jul 2017 15:22:32 +0000 (18:22 +0300)