Merge pull request #1255 from zestedesavoir/master

copie sur la branche prod
Merge pull request #1263 from zestedesavoir/master

MEP Release
Merge branch 'master' into prod
Security fix in PyYAML
Merge branch 'hotfix/pyyaml' into dev