Implements #1139
Merge pull request #1140 from emmanuel-keller/1.5

Implements #1139