Fix sync with 1.5 branch
Merge pull request #989 from emmanuel-keller/master

Fix sync with 1.5 branch