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