Implements #918
Merge pull request #919 from emmanuel-keller/1.5

Implements #918