Implements #979
Merge pull request #981 from emmanuel-keller/1.6

Implements #979