Implements #967
Merge pull request #970 from emmanuel-keller/master

Implements #967