Fixes #975
Merge pull request #976 from emmanuel-keller/1.5

Fixes #975