yaml-fr fixes
yaml-fr fixes
Merge pull request #859 from AndreiCurelaru/master

yaml-fr fixes