Un peu de nettoyage
Merge branch '1.6.0' into 1.6.1
Merge branch '1.6.1' into release-1.6.2