Implements #1083
Merge pull request #1084 from emmanuel-keller/1.5

Implements #1083