Fixes #1305
Merge pull request #1308 from emmanuel-keller/1.5

Fixes #1305