Impements #887
Merge pull request #888 from emmanuel-keller/1.5

Impements #887