Implements #1083
Merge pull request #1085 from emmanuel-keller/1.6

Implements #1083