Merge branch 'V9_6_BR'

diff --combined CMakeLists.txt
index b32f8195e873271e05c47dcfa0279bdd494fbe28,b7d3eb9f429c726dfcc4f6f1974c1c9bafa28fcc..fa0c4a4d7d34b02c764264598a17cffc0e19a68f
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -25,11 -25,11 +25,11 @@@ PROJECT(SalomeCOMPONENT 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
  # ===================