Implements #755
Merge pull request #760 from emmanuel-keller/master

Implements #755