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