Implement #525
Merge pull request #527 from emmanuel-keller/1.6

Implement #525