Implements #1179
Merge pull request #1180 from emmanuel-keller/1.5

Implements #1179