Implements #803
Merge pull request #804 from emmanuel-keller/1.5

Implements #803