Fixes #1118
Merge pull request #1119 from emmanuel-keller/1.5

Fixes #1118