Implements #1249
Merge pull request #1250 from emmanuel-keller/1.5

Implements #1249