Implements #1035
Merge pull request #1037 from emmanuel-keller/1.6

Implements #1035