Merge branch 'fr_2.21.0_rnd2' of git://github.com/jnavila/git