Implements #710
Merge pull request #714 from emmanuel-keller/1.6

Implements #710