Merge branch 'master' of esc-md-git.unil.ch:mdedonno/fsi_rmd_template