Implements #1298
Work on #1298
Merge pull request #1299 from emmanuel-keller/1.5

Implements #1298