Implements #451
Merge pull request #452 from emmanuel-keller/1.5

Implements #451