Merge branch 'develop' of esc-md-git.unil.ch:ICNML/docker into develop