Fixes #1118
Merge pull request #1121 from emmanuel-keller/master

Fixes #1118