Implements #1053
Merge pull request #1055 from emmanuel-keller/1.5

Implements #1053