apply fbc3502 to fr
apply c8571b3 to fr
apply 67bc107 to fr
apply c3ae214 to fr
apply ccffb46 to fr
apply 5502e94 to fr
apply d915805 to fr
apply bbc153a to fr
Merge pull request #378 from progit-fr/sync_with_en

Sync with en
Merge branch 'progit/master' into ja