Implements #869
Merge pull request #870 from emmanuel-keller/1.5

Implements #869