Fixes #985
Merge pull request #986 from emmanuel-keller/1.5

Fixes #985