Implements #869
Merge pull request #871 from emmanuel-keller/1.6

Implements #869