Merge remote-tracking branch 'origin/develop' into CosmoSkymed
Conflicts: Modules/IO/IOGDAL/src/otbGDALImageIO.cxx Modules/ThirdParty/OssimPlugins/src/ossim/ossimPluginProjectionFactory.cpp
This diff is collapsed.
Conflicts: Modules/IO/IOGDAL/src/otbGDALImageIO.cxx Modules/ThirdParty/OssimPlugins/src/ossim/ossimPluginProjectionFactory.cpp