Merge branch 'V9_8_BR'

diff --cc CMakeLists.txt
index 9957c65cb5bb14d41271cb37e40ae3340fcf212f,81ba58e157cd54c24093d429a117819e1aca2697..180c14f3d60662203b34004e6b03fe1d06206c5b
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -43,6 -36,11 +36,11 @@@ ELSE(
    MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
  ENDIF()
  
 -SALOME_SETUP_VERSION(9.8.0)
+ # Versioning
+ # ===========
++SALOME_SETUP_VERSION(9.8.0 DEVELOPMENT)
+ MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
+ 
  # Platform setup
  # ==============
  LIST(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)