Implements #934
Merge pull request #939 from emmanuel-keller/1.5

Implements #934