Merge branch 'fr-v2.4.0-rc0' of git://github.com/jnavila/git