Implements #589
Merge pull request #593 from emmanuel-keller/1.6

Implements #589