Merge branch 'master' into BR_quadtree

diff --cc src/HYDROData/HYDROData_AltitudeObject.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Bathymetry.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_CalculationCase.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Channel.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Entity.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Obstacle.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Polyline3D.cxx
Simple merge