Implements #1114
Merge pull request #1116 from emmanuel-keller/1.6

Implements #1114