Implements #1254
Merge pull request #1264 from emmanuel-keller/1.5

Implements #1254