Implements #899
Merge pull request #900 from emmanuel-keller/1.5

Implements #899