Implements #884
Merge pull request #1094 from emmanuel-keller/1.5

Implements #884