Implements #1253
Merge pull request #1261 from emmanuel-keller/1.5

Implements #1253