Merge branch 'franckduche-patch-1' into 2.4
Merging #545
Merge branch '2.5' into 2.4
Merge branch '2.5' into 2.4
Merging #552