Implements #967
Merge pull request #969 from emmanuel-keller/1.6

Implements #967