Fix #1224
Merge pull request #1294 from emmanuel-keller/1.5

Fix #1224