Implements #990
Merge pull request #991 from emmanuel-keller/1.5

Implements #990