more fr corrections
Merge branch 'master' into 2.5