Implements #1183
Merge pull request #1186 from emmanuel-keller/1.6

Implements #1183