Merge branch 'V9_6_BR'

diff --combined CMakeLists.txt
index dedc518e0c5c244f390fd387781cbd0503761d4f,13343d8027e00cf3d773512c91618e7a0a32ae75..755e551277a438d7bd725b2c0dcc55362341e26c
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -25,11 -25,11 +25,11 @@@ PROJECT(SalomeCALCULATOR 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
  # ===================