Implements #1060
Merge pull request #1066 from emmanuel-keller/1.5

Implements #1060