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