Implements #896
Merge pull request #897 from emmanuel-keller/1.5

Implements #896