Merge branch '5162da060ab077edbca365c6cb4d925312dc6d82' into 90ab65c801bd81ddc0602d0b7150dd988ea370b9
-> correspond à ce qu'aurait du faire normalement b462f7eda59e2596d9413c349cf809163d6a63d2
Merge branch 'issue76' into 1.5