Implements #755
Merge pull request #757 from emmanuel-keller/1.6

Implements #755