Rebase on the upstream master.
Rebase on the upstream master.

rdebroiz/medInria-public,aabadie/medInria-public,aabadie/medInria-public,NicolasSchnitzler/medInria-public,NicolasSchnitzler/medInria-public,rdebroiz/medInria-public,NicolasSchnitzler/medInria-public,aabadie/medInria-public,rdebroiz/medInria-public