Implements #1225
Merge pull request #1226 from emmanuel-keller/1.5

Implements #1225