Implements #755
Merge pull request #756 from emmanuel-keller/1.5

Implements #755