Implements #514
Merge pull request #1293 from emmanuel-keller/1.5

Implements #514