Implements #967
Merge pull request #968 from emmanuel-keller/1.5

Implements #967