Implements #1188
Merge pull request #1190 from emmanuel-keller/1.6

Implements #1188