Merge branch 'fr_2.18_rnd3' of git://github.com/jnavila/git