Merge branch 'master' of gitlab.esrf.fr:tomotools/tomoscan

3 jobs for master in 2 minutes and 12 seconds (queued for 2 seconds)