Implements #719
Merge pull request #807 from emmanuel-keller/1.5

Implements #719