Merge branch 'fr_v2.11.0_rnd1' of git://github.com/jnavila/git