Merge branch 'fr_v2.5.0-round2' of git://github.com/jnavila/git