Fixes #596
Merge pull request #616 from emmanuel-keller/1.5

Fixes #596