Fix merge 3.8
Merge pull request #879 from nlegoff/fix-master

[3.9] Fix merge 3.8