Merge branch 'V9_6_BR'

diff --combined CMakeLists.txt
index 03980253fcd474178fadf8d84f4db3111ed9dcf8,ba66dfa13760dc98235dac235e68a53b94fe96d4..1cfd9e273328ffe8e5ea75c75c82128e2a5918c2
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -27,11 -27,11 +27,11 @@@ PROJECT(SalomeGEOM C CXX
  STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
  
  SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
- SET(${PROJECT_NAME_UC}_MINOR_VERSION 5)
+ SET(${PROJECT_NAME_UC}_MINOR_VERSION 6)
  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
  # ===================