Fixes #1118
Merge pull request #1120 from emmanuel-keller/1.6

Fixes #1118