Fix error due to previous merge with origin/master
Fix error due to previous merge with origin/master

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