Fix 1134895
Merge pull request #819 from jvoisin/patch-9

Fix 1134895