Implements #589
Merge pull request #592 from emmanuel-keller/1.5

Implements #589