Implements #1005
Merge pull request #1076 from emmanuel-keller/1.6

Implements #1005