Merge branch 'laurent.heirendt-master-patch-61208' into 'master'

Update index

See merge request !101
3 jobs for master in 1 minute and 6 seconds (queued for 3 seconds)