Merge branch 'V9_4_BR'

diff --combined CMakeLists.txt
index 736e44255d9090b368e1d146e09aa9faa9b2e80a,d77181ee824669ce283be816ab3688a4ecf30c0f..a67e8504e396950c1453dc27479c015dd0e365f4
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -32,11 -32,11 +32,11 @@@ ENDIF(WIN32
  STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
  
  SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
- SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
+ SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
  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
  # ===================