Implements #979
Merge pull request #980 from emmanuel-keller/1.5

Implements #979