MRG: Merged develop into rfc-25-OpenGL_remote_desktop.
MRG: Merged develop into rfc-25-OpenGL_remote_desktop.

orfeotoolbox/OTB,orfeotoolbox/OTB,orfeotoolbox/OTB,orfeotoolbox/OTB,orfeotoolbox/OTB,orfeotoolbox/OTB