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