Implements #894
Merge pull request #895 from emmanuel-keller/1.5

Implements #894