Implements #1211
Merge pull request #1212 from emmanuel-keller/1.5

Implements #1211