Fix latest merge
Merge pull request #1156 from nlegoff/fix-latest-master-merge

[3.9] Fix latest merge