Fixes #947
Merge pull request #952 from emmanuel-keller/1.5

Fixes #947