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