Implements #1183
Merge pull request #1185 from emmanuel-keller/1.5

Implements #1183