Implements #990
Merge pull request #992 from emmanuel-keller/1.6

Implements #990