Merge branch 'V8_5_BR'

diff --combined CMakeLists.txt
index 0dd96a14c5220d3b848ad07e9424dd66deda0522,6baba0a4fc30294b5ccfdd6d952cb9889b7e94aa..f05d114cb795b490b0fbeb86b6133d424e10e7c4
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -28,11 -28,11 +28,11 @@@ CMAKE_POLICY(SET CMP0003 NEW
  STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
  
  SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
- SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
+ SET(${PROJECT_NAME_UC}_MINOR_VERSION 5)
  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
  # ===================