Implements #349
Merge pull request #927 from emmanuel-keller/1.5

Implements #349