Work on #1152
Merge pull request #1169 from emmanuel-keller/1.5

Work on #1152