Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maint