Implements #803
Merge pull request #805 from emmanuel-keller/1.6

Implements #803