Implement #525
Merge pull request #526 from emmanuel-keller/1.5

Implement #525