Implements #473
Merge pull request #474 from emmanuel-keller/1.5

Implements #473