Fix #737
Merge pull request #769 from emmanuel-keller/1.6

Fix #737