Merge branch V7_3_1_BR

diff --cc CMakeLists.txt
index 51158531921652fdb73187ef5bf3dbd651b43b41,e1ebcfcdea8384d8b3ef3049a30ed8099ee44909..1300477fcf3bd970a9720c565cfa700ad311d7cf
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -31,10 -31,10 +31,10 @@@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_
  
  SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
  SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
- SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
+ SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
  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)
  
  # Find KERNEL
  # ===========

diff --cc src/GEOM_I/GEOM_Gen_i.cc
index 5a9685b5d8decd1429d35e807ab0e6d5675ffdd2,e844dbcabf8d0648954c8959831b8c3cc2e39612..f51456c46e0526eca94360dcb2bd25d0e97df639
--- 1/src/GEOM_I/GEOM_Gen_i.cc
--- 2/src/GEOM_I/GEOM_Gen_i.cc
+++ b/src/GEOM_I/GEOM_Gen_i.cc
@@@ -110,14 -109,13 +110,11 @@@ GEOM_Gen_i::GEOM_Gen_i(CORBA::ORB_pt
    {
      //work around PAL12004, PAL12628
      //OSD::SetSignal( true );
--    bool raiseFPE;
- #ifdef _DEBUG_
-     raiseFPE = true;
-     char* envDisableFPE = getenv("DISABLE_FPE");
-     if (envDisableFPE && atoi(envDisableFPE))
-       raiseFPE = false;
- #else
-     raiseFPE = false;
++    bool raiseFPE = false;
+ #if defined(_DEBUG_) | defined(_DEBUG) //the Last for WIN32 default settings
 -  char* envEnableFPE = getenv("ENABLE_FPE");
 -  if (envEnableFPE && atoi(envEnableFPE))
 -    raiseFPE = true;
 -#else
 -    raiseFPE = false;
++    char* envEnableFPE = getenv("ENABLE_FPE");
++    if (envEnableFPE && atoi(envEnableFPE))
++      raiseFPE = true;
  #endif
      OSD::SetSignal( raiseFPE );
    }