Implements #1251
Merge pull request #1252 from emmanuel-keller/1.5

Implements #1251