Implement #1122
Merge pull request #1124 from emmanuel-keller/1.6

Implement #1122