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