Implements #923, fixes #924
Merge pull request #925 from emmanuel-keller/1.5

Implements #923, fixes #924