Work on #1035
Merge pull request #1044 from emmanuel-keller/1.5

Work on #1035