Fix #836
Merge pull request #837 from emmanuel-keller/1.5

Fix #836