Merge branch 'V9_7_BR'

diff --combined CMakeLists.txt
index ae28db508f69600d6ed2b4420003ad04fce81946,1494da96a53e41a56daf13455afc44329f415a07..ebb60ac8a47268ddf980173bb3a04bfbd20d26a0
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -25,11 -25,11 +25,11 @@@ PROJECT(SalomeHexoticPLUGIN C CXX
  STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
  
  SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
- SET(${PROJECT_NAME_UC}_MINOR_VERSION 6)
+ SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
  SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
  SET(${PROJECT_NAME_UC}_VERSION
    ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
 -SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
 +SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
  
  # Common CMake macros
  # ===================