Fixes #947
Merge pull request #953 from emmanuel-keller/1.6

Fixes #947