Implements #1241
Merge pull request #1302 from emmanuel-keller/1.5

Implements #1241