Implement #1122
Merge pull request #1123 from emmanuel-keller/1.5

Implement #1122