Implements #1188
Merge pull request #1189 from emmanuel-keller/1.5

Implements #1188