Implements #908
Merge pull request #909 from emmanuel-keller/1.5

Implements #908