Merge branch 'branch_test_fran'
Merge branch 'master' into branch_test_fran