Patch from master
Merge pull request #426 from emmanuel-keller/1.5

Patch from master