fix #1553
Merge pull request #732 from jygaulier/3.8-fix1553

fix #1553
Merge branch '3.8'