Merge branch 'fr_2.20_rnd1' of git://github.com/jnavila/git