Implements #934
Merge pull request #940 from emmanuel-keller/1.6

Implements #934