Fix #1316
Merge pull request #1317 from emmanuel-keller/1.5

Fix #1316